projects / emacs.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 42516f0 ea77c65)
Merge from origin/emacs-26
authorGlenn Morris <rgm@gnu.org>
Wed, 3 Oct 2018 16:25:26 +0000 (09:25 -0700)
committerGlenn Morris <rgm@gnu.org>
Wed, 3 Oct 2018 16:25:26 +0000 (09:25 -0700)
ea77c65 Revert "Temporary workaround for bug #32848 for branch emacs-26"
2c8ea46 Revert "* etc/NEWS: Note setting make-cursor-line-fully-visib...
f8df6f2 * etc/NEWS: Note setting make-cursor-line-fully-visible to ni...
cdca208 Fix note about interactive advice (Bug#32905)
508c40e Comple fix for Bug#32550

1  2 
doc/lispref/functions.texi patch | diff1 | diff2 | blob | history
lisp/net/tramp.el patch | diff1 | diff2 | blob | history

diff --cc doc/lispref/functions.texi
Simple merge
diff --cc lisp/net/tramp.el
Simple merge
Unnamed repository; edit this file 'description' to name the repository.